From c9eb7248a683cc1b278db018e1869c587a0c9a72 Mon Sep 17 00:00:00 2001 From: Michael Schumacher Date: Sat, 6 Jan 2007 13:48:10 +0000 Subject: [PATCH] don't go into the extensions subdirectory on Windows removed the 2007-01-06 Michael Schumacher * Makefile.am: don't go into the extensions subdirectory on Windows * extensions/Makefile.am: removed the win32_libs definition, using libgw32c does more harm than good, apparently svn path=/trunk/; revision=192 --- ChangeLog | 7 +++++++ Makefile.am | 8 +++++++- extensions/Makefile.am | 3 +-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ab279d..16ee3d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-06 Michael Schumacher + + * Makefile.am: don't go into the extensions subdirectory on + Windows + * extensions/Makefile.am: removed the win32_libs definition, using + libgw32c does more harm than good, apparently + 2007-01-06 Michael Schumacher * docs/Makefile.am: added EXEEXT to the tools used in some diff --git a/Makefile.am b/Makefile.am index e13ff49..15590d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,13 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 +if OS_WIN32 +extensions= +else +extensions=extensions +endif + SUBDIRS = babl \ - extensions \ + ${extensions} \ tests \ docs diff --git a/extensions/Makefile.am b/extensions/Makefile.am index aff9ec0..b976f3d 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -2,7 +2,6 @@ # file babl_extensions if OS_WIN32 -win32_libs = ../babl/.libs/libbabl.a -lgw32c -liberty -lole32 -luuid -lwsock32 no_undefined = -no-undefined endif @@ -19,7 +18,7 @@ CFLAGS += -I $(top_srcdir)/babl -I $(top_srcdir)/extensions -fPIC LDFLAGS += -shared -LDADD = $(win32_libs) $(no-undefined) +LDADD = $(no-undefined) %.so: %.c $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) -- 2.30.2